Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 26 Aug 2011 05:05:13 +0000 (22:05 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 26 Aug 2011 05:05:13 +0000 (22:05 -0700)
commit35e4c2ef1352758d2e561441077af8b1047ce2db
tree1b4038b8167dc70c81712858915bfbfd831e6fc5
parent983a60297d1ded9e594f94127f6064764d853d34
parent4a74c175c6ac971a219726f4d2102a7bf7abb725
Merge from trunk.